Merge "Add configs for new unit tests available in Android Pi" into pi-dev
am: efa8cd4fbc

Change-Id: I9beb07d88660977648d44ce9d38a9582b2516b3e