Changes made for proper AOSP build

Change-Id: I8587196ffdfc5c297216f095d7f2f51929a80be0