Tracking more of AOSP

Change-Id: If74df9a1039820070000bbd7ca274b4f5912ee7a
Signed-off-by: Evan Anderson <evan1124@gmail.com>