Changes made for proper AOSP build

Change-Id: Ide6793f209ddc387c5d7f5ee9f0f213ee628e798