Add some removed AOSP packages

Change-Id: Ibb806d6911881fbd42c4d73b3b546e28e57e1a36