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

Change-Id: Ia381bc98b0d7160f08472e3f8ea2ca84c354344d