Update Felix SVN to 12 Bug: 278035362 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:05f4a52222003d3f45bd3113448f36fa5f03084f) Merged-In: Ib688e37103e6b8fa34d7e468481906ecc95ffaf2 Change-Id: Ib688e37103e6b8fa34d7e468481906ecc95ffaf2