Merge "Refresh API19 include/android/* to android-4.4_r1"