Update felix SVN to  21

Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:29203a354d62370c5bd4e6e92592a00eead176e6)
Merged-In: Ib78cdb211e25b1ae28d120a974514de4c6db8d43
Change-Id: Ib78cdb211e25b1ae28d120a974514de4c6db8d43
1 file changed