build fixes

Change-Id: I11989eccd6987430245f9e21f859400dddb08e0e
remove trash file

Change-Id: Ic68e6526fbfc9c1bed8dab56b7f36ca4df1168bd
Merge branch 'cm-11.0' of git://github.com/faleandroid/android_frameworks_base-1 into cm-11.0