Merge "Fix typo when building aar"
am: f759166bb8

Change-Id: I4f4ffef85f5f3935d157f9e216e057df95fa62dd