minor change to make merging on append work correctly
Merge branch 'agate-4.3_r1' of github.com:SapphireAgate/android_platform_frameworks_native into agate-4.3_r1