Changes made for proper AOSP build

Change-Id: Ie9d6aceb74e7743930ba39a3ca503d1c24f18cee