Merge "Revert "Remove all prebuilt NDK system lib modules."" am: 88c70cd610 am: 3d326529a1 am: 529870a900
am: 7a12c1c6d9

Change-Id: I4ce601818cec7fd263edb844eb93337d16287b29