Changes made for proper AOSP build

Change-Id: Ib571dd20f87cc289bf37359be46531171a4aff0c