Android CTS 7.0 Release 14 (4372023)
Merge "Update the version number in Android.mk"
am: 638ea6c202

* commit '638ea6c2028a6b5b961f07508b0e1e14d7dc62b8':
  Update the version number in Android.mk