Android 4.3 updates

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