Merge "Support WAC decoding in UMTS format" am: 9bc9b80912
am: 6cf420a80e

Change-Id: I3f45f1ccfb2381c47d4a3680323d035fae2f3c83