Android o preview 4
Merge "Add missing transitive dependencies" am: 810544541d am: 6e49f97ae8
am: 5f6c67480a

Change-Id: I36727cdc526ad6038defa7c6c2ddedd2568e4175