going truly vanilla so lets use more AOSP stuff

Change-Id: Ib472619bfbf3a4e40776b52dbe21a07369b2e096