am 0a5b1596: am 42a111e5: am 9350dd44: am 85c1f088: revert API 17 system image to rev 1.

* commit '0a5b159698c94b718e6fd7395fb511b3476899d0':
  revert API 17 system image to rev 1.