Android 4.3 updates

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