DO NOT MERGE Fix lmp-sprout-dev build for generics addition
DO NOT MERGE Fix lmp-sprout-dev build for generics addition

Change-Id: I66f10264476df5504086a7fbc24d729798187d05

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base