Merge "Parse else ifxxx statement" am: 725af86fe7

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1501162

Change-Id: I6ced61a4bf42739318d80a4cf80463e07a6bb34e