UPSTREAM: Add some additional architectures

(cherry picked from commit 8fa2d839a428deb97762b7afcfef9666fd5e1640)
Signed-off-by: Benson Leung <bleung@google.com>

Bug: 24809436

Change-Id: Ibd2d363792d29876237ca1f4cf9604d7a0c20296
1 file changed