Tracking more packages from AOSP

Change-Id: Iefa885c60462880eb7c53093928e434722e7c9e0