Initial commit for aosp

Change-Id: I5de235bdea3c13262f8f5157b6f7bcace3fad3ba