make manifest more alike to aosp

Change-Id: Ib401d82b7c532797e5fdcd704108a0bc8af45690