fixed issues :)

Change-Id: If2d28454405fd5288be25b77d749ecf7d31078ba
Merge https://github.com/XPerience-AOSP/android_system_core into HEAD