Android 4.3 updates

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