Update felix SVN to 30 Bug: 302612466 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:acd9c7a658123df92ee49b358b01bc5811911905) Merged-In: Idf4b4f1f1f14b86b3205ba8249e0aeb0fb377359 Change-Id: Idf4b4f1f1f14b86b3205ba8249e0aeb0fb377359