am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"

* commit '0e25e4cd292dbc6bce330a876dedb7154e5cd847':
  Fix for issue 9656 - custom xml attributes in Android Libraries