Merge android 4.3.1_r1 into PA

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