Android 4.3 updates

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