Merge "Add two more libraries to mainline_system"
am: 159eb0938b

Change-Id: If9910175109920f584244539f35cf9f1438d7233