Android 4.3 updates

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