am 61c80d5e: Update policy for Android 4.2 / latest master.

* commit '61c80d5ec8632cadcf754eed0986b23284217c06':
  Update policy for Android 4.2 / latest master.